Force installation of fontconfig's preferred fonts for tests

The experimental dependency resolver is non-deterministic and can
choose various different fonts, some of which make the reftests fail.
Force its hand by choosing the fonts that fontconfig prioritizes highest,
so that we get deterministic results.

diff --git a/debian/control b/debian/control
index 55fd92dbb1e5c0e1d185bfd7d3b61f8cc64e7b8e..f73d0d3813877c329c96a7c6527c1bdac47fc2f9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                docbook-xsl,
                dpkg-dev (>= 1.17.14),
                fonts-cantarell <!nocheck>,
+               fonts-dejavu-core <!nocheck>,
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.41.3),
                gsettings-desktop-schemas <!nocheck>,
@@ -51,6 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                meson (>= 0.54),
                pkg-config,
                sassc,
+               ttf-bitstream-vera <!nocheck>,
                wayland-protocols (>= 1.20) [linux-any],
                xauth <!nocheck>,
                xsltproc,

diff --git a/debian/control.in b/debian/control.in
index 36647ec77923ccfacbae0ccbc8e26770c2e3d3ff..2c942228101b310d4b361c150ae39b8195e08e0e 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,6 +11,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                docbook-xsl,
                dpkg-dev (>= 1.17.14),
                fonts-cantarell <!nocheck>,
+               fonts-dejavu-core <!nocheck>,
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.41.3),
                gsettings-desktop-schemas <!nocheck>,
@@ -51,6 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                meson (>= 0.54),
                pkg-config,
                sassc,
+               ttf-bitstream-vera <!nocheck>,
                wayland-protocols (>= 1.20) [linux-any],
                xauth <!nocheck>,
                xsltproc,

diff --git a/debian/tests/control b/debian/tests/control
index bd26ad4472ec819eabd87a22732d215b1da48710..6427dedc9121ec8c47b855384ea625ddb7a43fbc 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -8,9 +8,9 @@ Depends: dbus, gir1.2-gtk-4.0, python3-gi, xauth, xvfb
 Restrictions: flaky, superficial
 
 Tests: installed-tests
-Depends: dbus (>= 1.8), gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, xauth, xvfb
+Depends: dbus (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, xauth, xvfb
 Restrictions: allow-stderr
 
 Tests: installed-tests-flaky
-Depends: dbus (>= 1.8), gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, xauth, xvfb
+Depends: dbus (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, xauth, xvfb
 Restrictions: allow-stderr, flaky